From 4d31b2ca0de8a8e10396b031e3c0a3c6b9948a68 Mon Sep 17 00:00:00 2001 From: Lapo Calamandrei Date: Wed, 2 Sep 2015 11:01:08 +0200 Subject: [PATCH] Adwaita: scales on selected list rows. --- gtk/theme/Adwaita/_common.scss | 18 ++++++++++++++ gtk/theme/Adwaita/gtk-contained-dark.css | 31 ++++++++++++++++++++++++ gtk/theme/Adwaita/gtk-contained.css | 31 ++++++++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 29789542a9..8abf21a639 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2302,6 +2302,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { border-color: $backdrop_borders_color; background-color: $insensitive_bg_color; } + //OSD troughs .osd & { border-color: $osd_borders_color; @@ -2325,6 +2326,23 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { } } } + // scales on selected list rows + .list-row:selected & { + border-color: $selected_borders_color; + &.trough { + box-shadow: inset 1px 1px transparentize(black, 0.9); + &:backdrop { box-shadow: none; } + &.highlight:backdrop { border-color: $selected_borders_color; } + } + &:insensitive, + &.trough.highlight:insensitive { + border-color: $selected_bg_color; + box-shadow: none; + background-color: mix($selected_fg_color, $selected_bg_color, 50%); + background-image: none; + &:backdrop { background-color: mix($backdrop_selected_fg_color, $selected_bg_color, 50%); } + } + } } @each $d,$dn in ('', 'horz'), diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 4a01502ee3..553d4a8fe7 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -3074,6 +3074,37 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop { border-color: rgba(0, 0, 0, 0.7); background-image: none; } + .list-row:selected .scale, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below { + border-color: #0f2b48; } + .list-row:selected .scale.trough, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough { + box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } + .list-row:selected .scale.trough:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop { + box-shadow: none; } + .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop { + border-color: #0f2b48; } + .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive { + border-color: #215d9c; + box-shadow: none; + background-color: #90aece; + background-image: none; } + .list-row:selected .scale:insensitive:backdrop, .list-row:selected .scale.trough.highlight:insensitive:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop { + background-color: #90aece; } .scale.scale-has-marks-below { -GtkScale-slider-length: 20; diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index f8e5619e02..b9cf139d47 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -3236,6 +3236,37 @@ GtkCheckButton.text-button, GtkRadioButton.text-button { .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop { border-color: rgba(0, 0, 0, 0.7); background-image: none; } + .list-row:selected .scale, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below { + border-color: #184472; } + .list-row:selected .scale.trough, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough { + box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1); } + .list-row:selected .scale.trough:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough:backdrop { + box-shadow: none; } + .list-row:selected .scale.trough.highlight:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:backdrop { + border-color: #184472; } + .list-row:selected .scale:insensitive, .list-row:selected .scale.trough.highlight:insensitive, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive { + border-color: #4a90d9; + box-shadow: none; + background-color: #a5c8ec; + background-image: none; } + .list-row:selected .scale:insensitive:backdrop, .list-row:selected .scale.trough.highlight:insensitive:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected + .scale.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below:insensitive:backdrop, .list-row:selected + .scale.vertical.scale-has-marks-above.scale-has-marks-below.trough.highlight:insensitive:backdrop { + background-color: #a5c8ec; } .scale.scale-has-marks-below { -GtkScale-slider-length: 20; -- 2.30.2